Adding assertion support