Refactor Unschema::Base