Better Enterprise Support

This extends things a bit from @keithduncan's pass in #28.