Adding optional enterprise support.