Enhance and complete Organization issues