Added extra assertions