Add more assertions..