Switched to a more generic Facade implementation and extended DB from that.