Cleaning of selectors
Added item builder and some validation