Adding headers, refactoring result domain