minor schema modifications
added service provider dummies
minor