added data sample support