Add support for "not" and clean up chart