Add additional asserts