Add keepExtension option