adding production environment support