Changes to add guardian