Added new idea to be reconsider in future.
Moved one model to another file and rename it.

Rename of the model was because there was discrepancy in between model
and dictionary that is being borned.