Add enterprise support