Additional info + refactoring