Improving system detection