Update custom properties handling