D7 improvements