Adding command-line only implementation.