Add aop/hooks, fix others libs