Improved mono support