I left it like this since it will need to be changed for phase 2 upgrades.
Shall I change this for now?