Re-added -o option for backward compatibility