Added other math classes