Added support for --required