#7: Improved support.