Add support for all suported types, - part 1