Changed map type and added Camera