Properly supporting quote manager