#25 more precise mapping proposal for typed, qualified and unqualified relations
#25 minor refactoring of metadata provider