Updated headers for backw. compat