Adding support for start & stop buttons