Refactored to add a ForgerRegistry