Improved kitmanager api