renaming, added validation
implemented new services