Begin adding property support