Is this needed given this 'should' be handled at the model layer?