Add struct facade pattern