Add hooks and include mixins