Improved analytic class inheritance

Applied comments from @embray on how to improve analytic class inheritance.