Structurized samples. Fixed warnings.