Implemented YambaManager, refactored accordingly