Changed to only use fields defined on the base block (without mixins)