Bugfix: Move ModelJDBC back to not break compatibility