Removing Value Objects from limitations as per #835