Now with actual support for optional properties :-)