New specs + new entity for specs + refactoring