Key improvements for 4.1