FELIX-3481 Add helper class to manage configurations with targeted PIDs FELIX-3577 Start factoring out some inner classes