added prefixes to static map
Merge remote-tracking branch 'origin/master' into amsterdamDemo