Added argument to specify output format (not used yet)