Feature/2 sample data