Fixed initialization order of fields/constructor
Added Locale input parameters
Prepared ground for imports