Bring back some functions, that might broke inner API