Refactored dynamic controllers