BAC-505: replace $this with static methods