Made files optional