Fix the equals methods using getCode instead of gatAuthorityKey and improving the comparaison with aliases.
Use Map instead of HashMap in statement in order to not rely on just one implementation of Map interface.
Change regex type in registries from String to Pattern to make the code more efficient.
Also make minor fixes in readRegistry method.