ENHANCEMENT: Included original author as well as upgrade author