Adapted written code to latest interfaces.