Some changes like use now SimpleStrategy