Added missing exports