Improved Latex support