Updated logic and added default-header.json