Replaced all occurrences of Hashtable with Map/HashMap and ConcurrentHashMap + did more refactorings on the Repository parts.