Moved type aggregator dictionary to config folder
added some more features