Adapted to unified header