Alter models and add migration

Change-Id: I9b4571906d39bcdb35048caa58d16ad5e888cce4
Add test classes

Change-Id: I8e698f3d4bcbaae585b44e68a44e969c3a9fb6f7