Updated to include format option