Be backwards compatible with older versions of SPM
Added todo