Added independent files to MATH wrappers