Adding best practices

Change-Id: I086781eefb602494eb41b3039ea63e0b91dbe862