diff --git a/src/fabric_att_handler.erl b/src/fabric_att_handler.erl
new file mode 100644
index 0000000..caf164c
--- /dev/null
+++ b/src/fabric_att_handler.erl
@@ -0,0 +1,166 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(fabric_att_handler).
+
+-include_lib("fabric/include/fabric.hrl").
+-include_lib("couch/include/couch_db.hrl").
+
+-export([att_store/2, att_get/2, att_delete/2, dataroot/2, att_store/5, external_store/0]).
+
+
+%% ====================================================================
+%% External API functions. Exposes a generic API that can be used with 
+%% other backend drivers
+%% ====================================================================
+
+att_store(FileName, Db, ContentLen, MimeType, Req) ->
+    DatarootName = dataroot_name(Db),
+    couch_log:info("Going to store ~p of length is ~p,"
+                        ++ " in the dataroot: ~p ~n",[FileName, ContentLen,
+                                                      DatarootName]),
+    %TO-DO: No chunk reader. All kept in the memory. Should be fixed.
+    Data = recv(Req, ContentLen),
+    case get_backend_driver() of
+        {ok, BackendDriver} ->
+            Headers = [{"Content-Length", ContentLen}],
+            case (BackendDriver):put_object(DatarootName, FileName, MimeType,
+                                            Headers, Data) of
+                {ok, NewUrl} ->
+                    case (BackendDriver):head_object(DatarootName, FileName) of
+                        {ok, {ObjectSize, EtagMD5}} ->
+                            {ok, {unicode:characters_to_binary(NewUrl, unicode, utf8),
+                                  ObjectSize, EtagMD5, (BackendDriver):store_id()}};
+                        {error, _} ->
+                            {error, Data}
+                    end;
+                {error, _} ->
+                    {error, Data}
+            end;
+        {error, undefined} ->
+            {error, Data}
+    end.
+
+att_store(Db, #doc{}=Doc) ->
+  att_store(Db, [Doc]);
+att_store(Db, Docs) when is_list(Docs) ->
+    DatarootName = dataroot_name(Db),
+    [#doc{atts=Atts0} = Doc | Rest] = Docs,
+    if 
+        length(Atts0) > 0 ->
+            Atts = [att_processor(DatarootName,Att) || Att <- Atts0],
+            [Doc#doc{atts = Atts} | Rest];
+        true ->
+            Docs
+    end.
+
+att_get(Db, Att) ->
+    DatarootName = dataroot_name(Db),
+    [Name,AttLen,AttLenUser] = couch_att:fetch([name, att_len,
+                                                att_extstore_size], Att),
+    couch_log:info("Going to retrieve ~p. DB length is: ~p, "
+                   ++ "stored length: ~p~n", [Name, AttLen, AttLenUser]),
+    case get_backend_driver() of
+        {ok, BackendDriver} ->
+            case (BackendDriver):get_object(DatarootName, Name) of
+            {ok, NewData} ->
+                NewAtt = couch_att:store([{data, NewData}, {att_len, AttLenUser},
+                                          {disk_len, AttLenUser}], Att),
+                {ok, NewAtt};
+            {error, _} ->
+                {error, "Get att ~p~n failed",[Name]}
+            end;
+        {error, undefined} ->
+                {error, "Get att ~p~n failed",[Name]}
+    end.
+
+att_delete(Db, Att) ->
+    %% Will be called during database compaction.
+    %% To-Do.
+    DatarootName = dataroot_name(Db),
+    [Name] = couch_att:fetch([name],Att),
+    couch_log:debug("Delete ~p from ~p", [Name, DatarootName]).
+
+dataroot(create, DbName) ->
+    couch_log:info("Create dataroot ~p~n", [DbName]),
+    case get_backend_driver() of
+        {ok, BackendDriver} ->
+            case (BackendDriver):create_dataroot(DbName) of
+                {ok, Dataroot} ->
+                    couch_log:debug("Dataroot ~p created succesfully ~n", [Dataroot]),
+                    {ok, Dataroot};
+                {error, _} ->
+                    couch_log:debug("Dataroot ~p creation failed ~n", [DbName]),
+                    {error, DbName}
+            end;
+        {error, undefined} ->
+           {error, "Create ~p~n failed",[DbName]}
+    end;
+dataroot(delete, DbName)->
+    %% Will be called when database is completely deleted.
+    %% To-Do
+    couch_log:debug("Delete dataroot ~p~n", [DbName]),
+    case get_backend_driver() of
+        {ok, BackendDriver} ->
+            (BackendDriver):delete_dataroot(DbName);
+        {error, undefined} ->
+                {error, "Delete ~p~n failed",[DbName]}
+    end.
+
+external_store() ->
+    config:get_boolean("ext_store", "attachments_offload", false).
+
+%% ====================================================================
+%% Internal general functions
+%% ====================================================================
+
+recv(#httpd{mochi_req=MochiReq}, Len) ->
+    MochiReq:recv(Len).
+
+get_backend_driver() ->
+    case config:get("ext_store", "active_store", undefined) of
+        "swift" ->
+            {ok, fabric_swift_driver };
+        undefined ->
+            {error, undefined}
+    end.
+
+dataroot_name(Db) ->
+    Suffix = list_to_binary(mem3:shard_suffix(Db)),
+    DbNameSuffix = erlang:iolist_to_binary([fabric:dbname(Db), Suffix]),
+    DbNameSuffix.
+
+att_processor(DbName, Att) ->
+    BackendDriver = get_backend_driver(),
+    [Name, Data, Type, Enc] = couch_att:fetch([name, data, type, encoding], Att),
+    couch_log:debug("Att name: ~p, Type: ~p, Encoding: ~p ~n", [Name, Type, Enc]),
+    case is_binary(Data) of
+        true ->
+            case (BackendDriver):put_object(DbName, Name, Type, [], Data) of
+                {ok, NewUrl} ->
+                    N1 = unicode:characters_to_binary(NewUrl, unicode, utf8),
+                    NewAtt = couch_att:store(data, N1, Att),
+                    case (BackendDriver):head_object(DbName, Name) of
+                        {ok, {ObjectSize,EtagMD5}} ->
+                            NewAtt1 = couch_att:store([{att_extstore_size, ObjectSize},
+                                                       {att_extstore_id, (BackendDriver):store_id()},
+                                                       {att_extstore_md5, EtagMD5}], NewAtt),
+                            NewAtt1;
+                        {error, _} ->
+                            Att
+                    end;
+                {error, _} ->
+                    Att
+             end;
+        _ -> 
+            Att
+    end.
diff --git a/src/fabric_db_create.erl b/src/fabric_db_create.erl
index a7f4ed9..9146d6d 100644
--- a/src/fabric_db_create.erl
+++ b/src/fabric_db_create.erl
@@ -164,6 +164,19 @@ make_document([#shard{dbname=DbName}|_] = Shards, Suffix) ->
         {[[<<"add">>, Range, Node] | Raw], orddict:append(Node, Range, ByNode),
             orddict:append(Range, Node, ByRange)}
     end, {[], [], []}, Shards),
+
+    case fabric_att_handler:external_store() of
+        true ->
+            DbNameSuffix = unicode:characters_to_list(DbName) ++ Suffix,
+            case fabric_att_handler:dataroot(create, DbNameSuffix) of
+                {ok, Container} ->
+                    couch_log:debug("Container ~p created", [Container]);
+                {error,_} ->
+                    couch_log:debug("Container ~p creation failed", [DbNameSuffix])
+            end;
+        false ->
+            couch_log:debug("Store attachmets externally is disabled",[])
+    end,
     #doc{id=DbName, body = {[
         {<<"shard_suffix">>, Suffix},
         {<<"changelog">>, lists:sort(RawOut)},
diff --git a/src/fabric_swift_driver.erl b/src/fabric_swift_driver.erl
new file mode 100644
index 0000000..5314cfb
--- /dev/null
+++ b/src/fabric_swift_driver.erl
@@ -0,0 +1,294 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+%   http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
+-module(fabric_swift_driver).
+
+-export([put_object/5, delete_object/2, get_object/2, head_object/2]).
+-export([store_id/0, create_dataroot/1, delete_dataroot/1 ]).
+%% ====================================================================
+%% OpenStack Swift implementation
+%% ====================================================================
+
+-define(l2b(V), list_to_binary(V)).
+
+store_id() ->
+    "swift".
+
+put_object(Container, ObjName, ContextType, CustomHeaders, Data) ->
+    couch_log:info("Swift: PUT ~p/~s object ~n", [Container, ObjName]),
+    case authenticate() of
+        {ok, {Url, Storage_Token}} ->
+            couch_log:info("token: ~p~n",[Storage_Token]),
+            ObjNameEncoded = couch_util:url_encode(ObjName),
+            Headers = CustomHeaders ++ [{"X-Auth-Token", Storage_Token},
+                                        %{"Transfer-Encoding", "chunked"}, 
+                                        {"Content-Type",
+                                         unicode:characters_to_list(ContextType)}],
+            Method = put,
+            couch_log:info("Swift: PUT : ~p ~p ~p ~p~n",
+                            [Url,ContextType, ObjNameEncoded, Container]),
+            NewUrl = Url ++ "/" ++ unicode:characters_to_list(Container) ++ "/" ++ unicode:characters_to_list(ObjNameEncoded),
+            couch_log:info("Swift: PUT url: ~p~n",[NewUrl]),
+            couch_log:info("~p ~n",[Data]),
+            case ibrowse:send_req(NewUrl, Headers, Method, Data) of
+                {ok, "201", _, _} ->
+                    {ok, NewUrl};
+                {ok, "202", _, _} ->
+                    {ok, NewUrl};
+               {error, {'EXIT', {normal, _}}} ->
+                    {error, "PUT object failed"};
+                Error ->
+                    couch_log:info("PUT object failed  ~p ~n", [element(2, Error)]),
+                    {error, "PUT object failed"}
+            end;
+        {not_authenticated, _} ->
+            {error, "Not authenticated"}
+    end.
+
+delete_object(Container, ObjName) ->
+    %TO-DO: should be called during database compaction. 
+    couch_log:info("Swift: Delete ~p/~p ~n", [Container, ObjName]),
+    case authenticate() of
+        {ok, {Url, Storage_Token}} ->
+            Header = [{"X-Auth-Token", Storage_Token}],
+            ObjNameEncoded = couch_util:url_encode(ObjName),
+            Method = delete,
+            NewUrl = Url  ++ "/" ++ unicode:characters_to_list(Container) ++ "/"
+                ++ unicode:characters_to_list(ObjNameEncoded),
+            couch_log:info("Swift: url ~p~n", [NewUrl]),
+            R = ibrowse:send_req(NewUrl, Header, Method),
+            case R of
+                {ok, ReturnCode, _, _} ->
+                    couch_log:info("Swift: Delete ~p. Return code ~p ~n",
+                                    [NewUrl, ReturnCode]),           
+                    {ok, ReturnCode};
+                Error ->
+                    couch_log:info("Swift: Delete ~p failed. ~n", [NewUrl]),
+                    couch_log:info("Swift: ~p ~n", [element(2, Error)]),
+                    {error, "Delete object failed"}
+            end;
+        {not_authenticated, _} ->
+            {error, "Not authenticated"}
+    end.
+
+get_object(Container, ObjName) ->
+    couch_log:info("Swift: get object ~p/~p ~n", [Container, ObjName]),
+    case authenticate() of
+        {ok, {Url, Storage_Token}} ->
+            Header = [{"X-Auth-Token", Storage_Token}],
+            ObjNameEncoded = couch_util:url_encode(ObjName),
+            Method = get,
+            NewUrl = Url  ++ "/" ++ unicode:characters_to_list(Container) ++ "/"
+                ++ unicode:characters_to_list(ObjNameEncoded),
+            couch_log:info("Swift: url ~p~n", [NewUrl]),
+            R = ibrowse:send_req(NewUrl, Header, Method),
+            case R of
+                {ok, ReturnCode, _, Body} ->
+                    couch_log:info("Swift: GET ~p with return code ~p ~n", [NewUrl, ReturnCode]),
+                    {ok, Body};
+                Error ->
+                    couch_log:info("Swift: GET ~p failed. ~n", [NewUrl]),
+                    couch_log:info("Swift: ~p ~n", [element(2, Error)]),
+                    {error, "Get object failed"}
+            end;
+        {not_authenticated, _} ->
+            {error, "Not authenticated"}
+    end.
+
+head_object(Container, ObjName) ->
+    couch_log:info("Swift: head object ~p/~p ~n", [Container, ObjName]),
+    case authenticate() of
+        {ok, {Url, Storage_Token}} ->
+            Header = [{"X-Auth-Token", Storage_Token}],
+            Method = head,
+            ObjNameEncoded = couch_util:url_encode(ObjName),
+            NewUrl = Url  ++ "/" ++ unicode:characters_to_list(Container)
+                ++ "/" ++ unicode:characters_to_list(ObjNameEncoded),
+            couch_log:info("Swift: url ~p~n", [NewUrl]),
+            R = ibrowse:send_req(NewUrl, Header, Method),
+            case R of
+                {ok, ReturnCode, Head, _} ->
+                    couch_log:info("Swift: ~p~p~n", [ReturnCode, Head]),
+                    ObjectSize = lists:filter(fun ({"Content-Length", _}) -> true; (_) -> false end, Head),
+                    EtagHeader = lists:filter(fun ({"Etag", _}) -> true ; (_) -> false end, Head),
+                    Etag = element(2, lists:nth(1, EtagHeader)),
+                    {ObjectSizeNumeric, _} = string:to_integer(element(2, lists:nth(1, ObjectSize))),
+                    couch_log:info("Swift: Object size is: ~p and Etag: ~p~n",
+                                    [ObjectSizeNumeric, Etag]),
+                    EtagDecode = hex_to_bin(Etag),
+                    EtagMD5 = base64:encode(EtagDecode),
+                    couch_log:info("Etag in base64 ~p~n", [EtagMD5]),
+                    {ok, {ObjectSizeNumeric, EtagMD5}};
+                Error ->
+                    couch_log:info("Swift: Head ~p failed ~n", [NewUrl]),
+                    couch_log:info("Swift: ~p ~n", [element(2, Error)]),
+                    {error,"HEAD object failed"}
+            end;
+        {not_authenticated, _} ->
+            {error, "Not authenticated"}
+    end.
+
+create_dataroot(DbName) ->
+    couch_log:info("Swift : create container ~p~n", [DbName]),
+    case authenticate() of
+        {ok, {Url, Storage_Token}} ->
+            Header = [{"X-Auth-Token",Storage_Token}],
+            Method = put,
+            Container = DbName,
+            NewUrl = Url ++ "/" ++ unicode:characters_to_list(Container) ++"/",
+            couch_log:info("Swift: url ~p ~n",[NewUrl]),
+            R = ibrowse:send_req(NewUrl, Header, Method),
+            case R of
+                {ok, "201", _, _} ->
+                    couch_log:info("Swift: container ~p created with code : 201 ~n",[Container]),
+                    {ok, Container};
+                {ok, "202", _, _} ->
+                    couch_log:info("Swift: container ~p created with code : 202 ~n",[Container]),
+                    {ok, Container};
+                Error ->
+                    couch_log:info("Swift: container ~p creation failed : ~p~n",[Container, element(2,Error)]),
+                    {error, "Failed to create container"}	
+            end;
+        {not_authenticated,_} ->
+            {error, "Failed to create container. Not authenticated"}
+    end.
+
+delete_dataroot(Container) ->
+    case authenticate() of
+        {ok,{Url,Storage_Token}} ->
+        Header = [{"X-Auth-Token",Storage_Token}],
+        Method = delete,
+        NewUrl = Url ++ "/" ++ Container ++"/",
+        R = ibrowse:send_req(NewUrl, Header, Method),
+        case R of
+            {ok, ReturnCode, _, _} ->
+                    {ok, {ReturnCode,Container}};
+                Error ->
+                    {error, {element(2, Error), Container}}
+        end;
+        {not_authenticated, _} ->
+            {error, "Not authenticated"};
+        {not_supported, Error} ->
+            {error, {element(2, Error), ""}}
+    end.
+
+%% ====================================================================
+%% Internal functions
+%% ====================================================================
+
+hex_to_bin(Str) -> << << (erlang:list_to_integer([H], 16)):4 >> || H <- Str >>.
+
+authenticate() ->
+    couch_log:info("Going to authenticate in Swift",[]),
+    case config:get("swift", "auth_model", "tempauth") of
+        "tempauth" ->
+            swift_v1_auth();
+        "keystone" ->
+            keystone_auth();
+        Error ->
+            couch_log:info("Authentication method is not supported: ~p", element(2,Error)),
+            {not_authenticated, ""}
+    end.
+
+keystone_auth() ->
+    Method = post,
+    URL = config:get("swift", "auth_url"),
+    Header = [{"Content-Type", "application/json"}],
+    Tenant = ?l2b(config:get("swift", "account_tenant")),
+    User = ?l2b(config:get("swift", "username")),
+    Psw = ?l2b(config:get("swift", "password")),
+    BodyValue = {
+           [
+            {auth, {[
+                   {tenantName, Tenant},
+                   {passwordCredentials, {[
+                                           {username, User},
+                                           {password, Psw}
+                                          ]}
+                   }
+                   ]}
+            }]},
+    Body = jiffy:encode(BodyValue, [force_utf8]),
+    couch_log:info("~p~n", [Body]),
+    R = ibrowse:send_req(URL, Header, Method, Body),
+    {ok, ReturnCode, _, Response} = R,
+    case ReturnCode of
+        "200" ->
+            couch_log:info("keystone: authenticated: ~p~n", [ReturnCode]),
+            Json = jiffy:decode(Response), 
+                {Json1} = Json,
+                {Access} = proplists:get_value(<<"access">>, Json1),
+                {Token} = proplists:get_value(<<"token">>, Access),
+                TokenID = proplists:get_value(<<"id">>, Token),
+                AuthInfoBinary = extractAuthInfo(Json, [{<<"access">>, ""},
+                                                        {<<"serviceCatalog">>, ""},
+                                                        {<<"name">>, <<"swift">>},
+                                                        {<<"endpoints">>, ""}]),
+                {ok, {binary_to_list(lists:nth(1, AuthInfoBinary)),
+                      binary_to_list(TokenID)}};
+        _ ->
+            couch_log:info("keystone: not authenticated: ~p~n", [ReturnCode]),
+            {not_authenticated, ""}
+    end.
+
+swift_v1_auth() ->
+    Method = get,
+    URL = config:get("swift", "auth_url"),
+    Header = [{"X-Storage-User", config:get("swift", "account_tenant") ++ ":"
+              ++ config:get("swift", "username")},
+              {"X-Storage-Pass", config:get("swift", "password")}],
+    R = ibrowse:send_req(URL, Header, Method),
+    {ok, ReturnCode, Head, _} = R,
+    case ReturnCode of
+        "200" ->
+            couch_log:info("swift v1: authenticated: ~p~n", [ReturnCode]),
+            Storage_URL_F = fun ({"X-Storage-Url", _}) -> true ; (_) -> false end,
+            Storage_URL = lists:filter(Storage_URL_F, Head),
+            Storage_Token_F = fun ({"X-Storage-Token", _}) -> true ; (_) -> false end,
+            Storage_Token = lists:filter(Storage_Token_F, Head),
+            {ok, {element(2, lists:nth(1, Storage_URL)), element(2, lists:nth(1, Storage_Token))}};
+        _ ->
+            couch_log:info("swift v1: not authenticated: ~p~n", [ReturnCode]),
+            {not_authenticated, ReturnCode}
+    end.
+
+extractAuthInfo([{_,_}|_] = Obj,[])-> 
+    Storage_URL = proplists:get_value(<<"publicURL">>, Obj),
+    Storage_Token = proplists:get_value(<<"id">>, Obj),
+    Status = true,
+    [Storage_URL, Storage_Token, Status];
+extractAuthInfo([{[{_,_}|_]}] = Obj, [])->
+    [{ObjNext}] = Obj,
+    Storage_URL = proplists:get_value(<<"publicURL">>, ObjNext),
+    Storage_Token = proplists:get_value(<<"id">>, ObjNext),
+    Status = true,
+    [Storage_URL, Storage_Token, Status];
+extractAuthInfo([{_,_}|_]=Obj,KeyValPath)->
+    [{Key, Val}|KeyValPathNext] = KeyValPath,
+    ObjVal = proplists:get_value(Key,Obj),
+    case Val of
+        [] -> extractAuthInfo(ObjVal, KeyValPathNext);
+            ObjVal -> extractAuthInfo(Obj, KeyValPathNext);
+        _ -> ["", "", false]
+    end;
+extractAuthInfo([{[{_,_}|_]}|L]=Obj,KeyValPath)->
+    [ObjCur| _] = Obj,
+    [Storage_URL, Storage_Token, Status] = extractAuthInfo(ObjCur, KeyValPath),
+    case Status of
+         false -> extractAuthInfo(L, KeyValPath);
+         _ -> [Storage_URL, Storage_Token, Status]
+    end;
+extractAuthInfo(Obj,KeyValPath) when is_tuple(Obj)->
+    {Doc} = Obj,
+    extractAuthInfo(Doc, KeyValPath).
+
+