Few more additions to Locatable