Added missing exports etc