Support multi-properties. Generally clean up property management code.