Change for JAVA components and EDGE condition for NC