Added surface output format support