Better option and documentation