add support for negnumber and comma