Samples and schema adjusted to cover dev aspects