Added more formatting options