Update documentation
Update implementation
Update feature helpers