Add changes from latests commits