Added some new classes to handle media cells