Add sample configuration
Change sample configuration encoding