added improved Catalyst Model, changed demo model, cosmetic changes at domain class