Added more tasks to mappings