Add needed asserts