Add support for multiple related clips