Added consistency, support for dummy objects.