Updated convenience header.