Minor Item refactoring

+ Item link augments handled.