WIP: Simplify environment registry API