Added Class for next work