Added more custom formats