Create hash instead of bare variables