Add support for hybrid properties