Added more parse options for types