Added id lookup