Fixes on new generate admin class