General updates and Translation ready