Refactoring + new specs + support for 'Naming storage'