Updated build with the last changes