Added model & collection definitions
Updated model with default values