Added OOM and ZOM