Adding metrics and improving video creator