Better separation of classes