Added final two classes for MzTab