Moved user related tables to plugin