Extract interfaces, cleanup
Remove unneeded decorator logic
Add namespaced keys object resolution