Added more CM tracking for JAVA 6/7support