Allow overriding of the system configuration items
A little tidying