Update classes to take changed RDH methods into account
Merge origin/sqlite into sqlite