Added simple validator and Storage class