update for refactoring to support machine specific config. part 1