Added relevant references in headers