Added more assert functions