Add re-initialization capability