Revert "Remove bunch of useless code"
Merge pull request #2 from kelvinyap92/revert-1-2.0

Revert "Remove bunch of useless code"