Refactor

Storage and validators