samples added with changes in core to support them