Update with proper property names