added tables PREFIX where needed