Optimized structure + added date translation

TO MERGE