(refactor) Added strongly-typed headers.