Updated to include more function mapping for instance retrieval