commit 10/6

Cambios en common entities