/* Custom overrides and enhancements */