Added some more assertions