Improve primitive property handling