Some changes due to new interface