Refactory adding additional classes