Refactor and keep a unique Map for the app