Model fields fixes for Server usage