adds missing fields handling