Updated wrapper to use magic __call instead of tightly coupled methods