Added notes and handle missing targetName