Added some asserts