Add more types and Formatting,... again