Added $format support