Added more function names