Added helper class and more XML documentation