rmerged Provider into SnomProvider, small fixes