Adding filtering and validation to the model for better protection