Easier go syntax
Added locale
Comply to new data model