Updated to include the full sample configuration