Added Class for storing relevant data