Cleaned up controller support implementation