Made ID more accessible (see ticket)