Nicer model detection