Added more node types to identify appropriate mappings to occur. For #37