Added the remaining methods