Added custom number type handling

Signed-off-by: DeanGores <dmgores@gmail.com>