Added map & tests