Adding support to production