Adding support for filling data between page loads