Add + list support, #12