refactoring of variable model and pojo
Refactored data model
Merge remote-tracking branch 'origin/api-console' into development