Improve sample configuration