added class, function, object mapping