Added support some fields