Big modification - switch to macros for parent class access