Performance tweak on API controller
Performance tweak on API's controller