Fix on model tables references