Removed dummy classes and changed implementation logic