Refactored Bass support