Added intial sample support