Adding some missing stuff