Move map initiaion into controller