Added a few assertions