Added logic to seperate Contact and Metadata organizations