Cts fix registry manager

Fix the registry manager and add javadoc