Add some validations and new arguments