Changed fields to properties