Reworking data access to go always through facades