Update headers
Extract re-usable utility classes