Extended with full variables names