Updated production stage