Fixed headers, refurnished API