Add numbers support !NO TESTS!