Fixed specs and updated resource generator.