Fix persist, use globals