Adding migration, and aesthetic changes to remote code