Added lookup by id