This commit moves some required entities from controller to API level, and implements a limit on the number of context commits that will be returned from the API.