Making compatible to new changes