Add Messages and Media resources

Tests are still needed