Force CLI revisited