Version 2.0

Massive rewrite for registry manager