Add some extensions based on feedback from @zvowell.