Thanks for the answer, Minus_Kelvin! It would be much appreciated if you could add that to your backlog as you suggested.
The only thing preventing me from making these changes myself is that after our experience on a previous AAA project, my team has a very strict No Engine Changes policy in effect 
Thanks,