Added support for generated properties