major upgrade of registry and data providers
added some comments