Refactor properties code, implement by_property lookup.
Working updates in loader.