Design Changes

Adding small class to the previous commit.