Added support for overriden properties