Added some classes so that we can keep code cleaner.