Added all the missing stuff