Need better way to sync models