Support Map for return types
Revert change to getGenericType