added initial mapping logic