My overrides for using with YADR