Specify decorator per model

[soycamo]

With this series of patches, a decorator can be explicitly set on a model.

It is recommended to squash the commits when pulling this code. I was not able to do this from my side.

If you have any concerns or find problems with this code, please let me know and I will incorporate this into my branch.