Add fields to support spacing