Some TODO annotations in class scp