Updates for new vspace interface