Deal to a separate class