Added all the remaining methods