Added Mac target
Support other headers