Improved performance and caching
Added movie part