Added hybrid property exclusion