Added more assertions