Added mediagroup support