adding support for data-restore-position