Added some org configuration