Id class refactor