Extend Function definition set
Review and extend Map case