Use more modern setup style