Changed Property to ProperyUnit