Start migrating methods to the new format