Update due to change in BEAM API