Added adapter and hook generators