WIP: registry and user added