Moved registry methods to main class