Added edit fields and device model properties.