Implement headers
Better logging