Refactor to work with updated Music-AtonalUtil