Fix custom property support