Changed Persistence from singleton to normal class