Started improving files plugin