Adding ItemSelector and refactoring node and link selector