removed Id Wrapper
Minor additions