Address review remarks for request & controller type mapping improvements