Made some changes to use the safer EntProp calls