Adding availability check to the new files