added generators
updated cli commands