Adds handling of --organization