Added CLI stuff