[WIP] Removed the argument, added a nullable attribute to properties