move common fields to std struct