Added collision map and app states