Changed header definitions