Added remaining fields to Node entity and form