Add support for default data property