Adding new handler for new list mapping