Add checks for remaining boundary events