Added Some Model Validation