added lookup by id or key