Latest version with new property getter implementations