1. -Polish map logic to better fit component editor.