Added back in media and db