Configurable registration.
Some minor changes.