break api changes and fix tables