Adding some validation
Merging stuffs