Added CLI scaffold