Some changes, removed interfaces.