General enhancements to system