Updated structure with Multi Language support