Add Name Validator and some fixes