Updated headers and documentation