Add more asserts