Added all necessary fields