Added support to basic structures on KO/Mapper