changed dataStructures back to lower case
added tenant lookup stuff