Added Strategy objects, removed enums as they are likely unnecessary.