Refactoring (class names changed)