Added prop and map changing