Added new helper class method to avoid code duplication