Add more comments for property workaround