Added capacity for earlier output versions