Changes to support version reporting