Modifications to provider models
Merge branch 'master' of github.com:basti35/eFM
Merge branch 'master' of github.com:basti35/eFM