Added hashMap and expression for variables