adding more support and headers