Refactoring of persistent descriptor model, its dao and tests