Added explicit relayer calls where map() was previously used.