Started to add support for movie selection