Add changes for compability with bem-info