Add more assert