Change variables map to ThreadLocal