Added better movie support to Builder