Added source/target hints