Added config, registry and parsing logic