Addition validation objects
Some validation fixed