Added support for runtime properties