Simplify code by replacing inheritance with module inclusion