Allow using any value for keys and values in objects
Go back to using objects for objects