Feature/modulable map system