Added model validation & unit test