Added model class & service layer