added support of mapped (associative) types