CORE 2122 - added organization support for application.