Refactor to add Valuable class as base