Added remaining validations
0.0.4