Rework the library writting
Add support for movies