Added models class and helper