Added dedicated collision map class and matching message type