Added format parameter and option