[+FEATURE] Added property value support