Modified variables to allow overriding