Added bin/oct/hex to value regex, updated value parser to detect type.