Class has been renamed. Little bit of refactoring. New methods have been added.