ERT-605 Fix to only initialise needed files