Add support for hasOne