Added some cost and descriptions
Merged changes to generator with validator