Added more fields and tables