Improvements to civic id methods and samples