Updates interfaces and remove deprecated entity method.