Added scratch support