Reworked migrations
Last version from work office