Added and setup Guard