Updates for loading few files in header