Added CLI support