#40 Added new Map