Updated ApiController