Update documentation and adjust sources accordingly