Added linespan support