[PROPOSE] Enhancements to