Added Map and Player classes