Added derived variables