Critics control - moving critics related code in separate file