Some updated exports