Added some missing hooks (needs further implementing though)