Changed object names
Changed CoreElement fields to properties