Added support for a single production