#49 Refactor for constant, use Registry instead