Assertion support added