Removed faulty migration attempt, modified fields, re-merged Property