Improved blueprint support.