Primary keys now ordered properly