Support hybrid properties

Fixes #135