Updates and improvements to Extending