Added validator and modified generator