Moved selector tool into global scope