Adding more assertions