Add ability to configure organization name