Overhauled movies to comply with new schema (not finished)