Move 3k compat stuff to own module