Added more header includes