Improved definition of cycle class.