Added class to support no list type