Implement new filesytem and media models