Refactoring Added bimap class, edited registry classes