Add type to function mapper