Added Stock check, delivery and collection modes