Replace copy & paste fields with inheritance