Work on portable math support