Added implementation for the remaining methods