Fixing some stuff adding some dynamic hooks