Added checks