[+BUGFIX] Added property value support