Added more Value types