[CORE] Add long and short type