Updated for SPAN support.