More refinements before version 8 release