Adding more documetation
Revert SimpleServices change and exclude the file from build