Updated for features RPM-4.0 (NOT backward compatible)