Added more missing functions