Revised map component