More elaborate host/target systems handling