+ More Stoke/CS build target support