Improve AEM model and appcategoryclassify.java