Updated header and config