jf-common proprietary added