added changes to support id changes