Added updates to further externalise configs - UNIT TESTS PENDING