Changed provider format and added removal