Added default states in model
Merge