Added more functions that must be implemented