Added TODO [ci skip]
Updated examples [ci skip]