Move generic type from Enforcer class to methods