added more models and fields