Added remaining methods