Controller plugin enhancements