Closes #8 - New feature registration context