Some cleaning up
Allow possibility to overwrite area key names
Merge branch 'feature/refactor' into develop