Added media related classes