Added proper case classes for completion state