Added scoped resolution of abbreviated keys