Improve Monte typemaps