New header and class abstractions