[CORE] Replace base_type by value
[CORE] Add int and uint values