Add preliminary support for tactics