#51: Added first refactoring for the new controller system.