Added more delegate methods