Enhanced binnie's mod compatibility