MUS-99: Refactoring