Cartodb adaptor refactor