Added vanilla compatibility