FIX #26 added users to exports