Refactor for classical inheritance