Added NumberUtil support