Make Lion.Model 2 separate mixins