Feature/registry