add beamtag support