Add changes from bem-info