Updated with new ManageBlock/ManageFile interfaces