Added "format" option