Added Map'CPS