Finished work on multi-master object manager