Reimplemented new tags and changes to runner to support them

Change-Id: Iea1d746aca8a18508ed055991a89c052141c9526