Improve PropertiesAdapter

Property class is now tokenized, which makes it much easier to work with properties.