Added ability to specify WATER attribute
Added "musicId" property to Map class