Move to pre-defining whether a prefix should be added as this value should remain constant