Update after eCASS V1 code review - Needle exchange stock bulkified