Changed label provider and added persisting state