added CLI support