Added support for long options