Added checks for existence