Id class refactor
Merge pull request #2 from merongivian/id-class-refactor

Id class refactor