Added Player and map structure