Moved from db calls to self API calls.