Feature/jarv/move vars to role