Implemented JC-778
-added migration file
Implemented JC-778
-refactor code according to recommendation
Merge branch 'JC-778'