More Piper models
Deprecation warning
Code clean up