Feature/mammothbane/compat