More additions and changes for 1.7