Support building all the basic types
Modify types to match rks