Added new headers for organization