Updated to work with BRMS 5.3.1