Moved to schema pe schema vigi
some improvement