Added hooks to entities