Add headers, rename some methods