VID-383 Use $app rather than $this