Missed some package names, also more permissible visibility
GenericController support