adding more features to generator