Added new states, highlight and is accessible