Added asserts