Refactoring. Removed "information source" field.