Some model storage reworking
Add before save method to model properties
Add before save method to model properties
Add before save method to model properties