Urgent revert code to Chris K's previous implementation. Dictionaries will not be kept in jar file and so my changes were useless