Improve mixin (add things, etc)