Fixed ToDo-Strings, implemented configurable Provider