Added some assertions