Enhancements to Plant