Some validations and methods added