Changed ACMS, minor change in ERMS FunctionalityEntity