Chore/move monkey patches