Added cpu and memory tuning to map