Added some span length features