Improve assertions feature