Add basic format argument logic