Add other missing stuff