In this PR are pruposed changed that come up when i started the data migration. Plese review them an approve and disaprove.