Better separation of class