Added getId to map