First pass - adding support for enterprise