Update to improve assertions