Added class for persistance