Fix for measure acquisition in S&A module. Some db/storage refactor.