Updated some logical properties and removed duplicated selectors. Still needs...