Convert some model mixins to concerns