First draft of PropertySupport implementation