Add support for start / terminate instance