Updated to use beaver==31 and added config changes