As a follow up to https://github.com/db-ui/core/pull/218 let's migrate all of the previous implementations