added union type. implemented url-locator