#25 added mapping proposals for typed and qualified relations