Using Celeri instead of the custom made CLI