Completion support - added mapping code