Add extends / mixins