Added handling of span(..)