Added initial sampling support