Added hAppy Support and header format