Add support for option alias