Adapted to Beacon V4