Updated geometry structure, fixes to AnyCollection, addition of PropertyMap