Integration with submanager
Better error handling