Change class signature for casses household