Adds initial support for stop setup and teardown