Added model methods and data