Supporting name as locator WIP