updates for custom api and scheduler