Updated comments and prepared a new feature

Change-Id: I1746bdb2413f2a7ca3b8e52b48cc959f37e3a317