Extend instead of include where necessary