[WIP] Include other hooks