Small crud optimization