Re design database for better Localisation handling