Fixed new interfaces changes