Added missing $mode property
Reorganized imports