diff --git a/account_bank_statement_import_camt/README.rst b/account_bank_statement_import_camt/README.rst
index f027351..a564f7a 100644
--- a/account_bank_statement_import_camt/README.rst
+++ b/account_bank_statement_import_camt/README.rst
@@ -28,6 +28,7 @@ Credits
 Contributors
 ------------
 
+* Holger Brunn <hbrunn@therp.nl>
 * Stefan Rijnhart <srijnhart@therp.nl>
 * Ronald Portier <rportier@therp.nl>
 
diff --git a/account_bank_statement_import_camt/__init__.py b/account_bank_statement_import_camt/__init__.py
index 7dafcd1..6350c71 100644
--- a/account_bank_statement_import_camt/__init__.py
+++ b/account_bank_statement_import_camt/__init__.py
@@ -1 +1,5 @@
-from . import account_bank_statement_import
+# -*- coding: utf-8 -*-
+# © 2013-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import models
+from . import camt
diff --git a/account_bank_statement_import_camt/__manifest__.py b/account_bank_statement_import_camt/__manifest__.py
index a59c096..d2415dc 100644
--- a/account_bank_statement_import_camt/__manifest__.py
+++ b/account_bank_statement_import_camt/__manifest__.py
@@ -1,25 +1,9 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Copyright (C) 2013-2015 Therp BV <http://therp.nl>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2013-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     'name': 'CAMT Format Bank Statements Import',
-    'version': '8.0.0.3.0',
+    'version': '10.0.1.0.0',
     'license': 'AGPL-3',
     'author': 'Odoo Community Association (OCA), Therp BV',
     'website': 'https://github.com/OCA/bank-statement-import',
@@ -27,8 +11,7 @@
     'depends': [
         'account_bank_statement_import',
     ],
-    'demo': [
-        'demo/demo_data.xml',
+    'data': [
+        'views/account_bank_statement_import.xml',
     ],
-    'installable': False,
 }
diff --git a/account_bank_statement_import_camt/account_bank_statement_import.py b/account_bank_statement_import_camt/account_bank_statement_import.py
deleted file mode 100644
index 8814670..0000000
--- a/account_bank_statement_import_camt/account_bank_statement_import.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-"""Add process_camt method to account.bank.statement.import."""
-##############################################################################
-#
-#    Copyright (C) 2013-2015 Therp BV <http://therp.nl>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-import logging
-from openerp import models
-from .camt import CamtParser as Parser
-
-
-_logger = logging.getLogger(__name__)
-
-
-class AccountBankStatementImport(models.TransientModel):
-    """Add process_camt method to account.bank.statement.import."""
-    _inherit = 'account.bank.statement.import'
-
-    def _parse_file(self, cr, uid, data_file, context=None):
-        """Parse a CAMT053 XML file."""
-        parser = Parser()
-        try:
-            _logger.debug("Try parsing with camt.")
-            return parser.parse(data_file)
-        except ValueError:
-            # Not a camt file, returning super will call next candidate:
-            _logger.debug("Statement file was not a camt file.",
-                          exc_info=True)
-            return super(AccountBankStatementImport, self)._parse_file(
-                cr, uid, data_file, context=context)
diff --git a/account_bank_statement_import_camt/camt.py b/account_bank_statement_import_camt/camt.py
index 81fd1de..d5fa82d 100644
--- a/account_bank_statement_import_camt/camt.py
+++ b/account_bank_statement_import_camt/camt.py
@@ -1,28 +1,9 @@
 # -*- coding: utf-8 -*-
 """Class to parse camt files."""
-##############################################################################
-#
-#    Copyright (C) 2013-2015 Therp BV <http://therp.nl>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as published
-#    by the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2013-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 import re
-from datetime import datetime
 from lxml import etree
-from openerp.addons.account_bank_statement_import.parserlib import (
-    BankStatement)
 
 
 class CamtParser(object):
@@ -58,7 +39,7 @@ class CamtParser(object):
                     attr_value = found_node[0].text
                 else:
                     attr_value = join_str.join([x.text for x in found_node])
-                setattr(obj, attr_name, attr_value)
+                obj[attr_name] = attr_value
                 break
 
     def parse_transaction_details(self, ns, node, transaction):
@@ -67,16 +48,21 @@ class CamtParser(object):
         self.add_value_from_node(
             ns, node, [
                 './ns:RmtInf/ns:Ustrd',
-                './ns:AddtlTxInf',
                 './ns:AddtlNtryInf',
-            ], transaction, 'message')
+                './ns:Refs/ns:InstrId',
+            ], transaction, 'note', join_str='\n')
+        # name
+        self.add_value_from_node(
+            ns, node, [
+                './ns:AddtlTxInf',
+            ], transaction, 'name', join_str='\n')
         # eref
         self.add_value_from_node(
             ns, node, [
                 './ns:RmtInf/ns:Strd/ns:CdtrRefInf/ns:Ref',
                 './ns:Refs/ns:EndToEndId',
             ],
-            transaction, 'eref'
+            transaction, 'ref'
         )
         # remote party values
         party_type = 'Dbtr'
@@ -88,15 +74,15 @@ class CamtParser(object):
             './ns:RltdPties/ns:%s' % party_type, namespaces={'ns': ns})
         if party_node:
             self.add_value_from_node(
-                ns, party_node[0], './ns:Nm', transaction, 'remote_owner')
+                ns, party_node[0], './ns:Nm', transaction, 'partner_name')
             self.add_value_from_node(
                 ns, party_node[0], './ns:PstlAdr/ns:Ctry', transaction,
-                'remote_owner_country'
+                'partner_country'
             )
             address_node = party_node[0].xpath(
                 './ns:PstlAdr/ns:AdrLine', namespaces={'ns': ns})
             if address_node:
-                transaction.remote_owner_address = [address_node[0].text]
+                transaction['partner_address'] = [address_node[0].text]
         # Get remote_account from iban or from domestic account:
         account_node = node.xpath(
             './ns:RltdPties/ns:%sAcct/ns:Id' % party_type,
@@ -106,35 +92,52 @@ class CamtParser(object):
             iban_node = account_node[0].xpath(
                 './ns:IBAN', namespaces={'ns': ns})
             if iban_node:
-                transaction.remote_account = iban_node[0].text
+                transaction['account_number'] = iban_node[0].text
                 bic_node = node.xpath(
                     './ns:RltdAgts/ns:%sAgt/ns:FinInstnId/ns:BIC' % party_type,
                     namespaces={'ns': ns}
                 )
                 if bic_node:
-                    transaction.remote_bank_bic = bic_node[0].text
+                    transaction['account_bic'] = bic_node[0].text
             else:
                 self.add_value_from_node(
                     ns, account_node[0], './ns:Othr/ns:Id', transaction,
-                    'remote_account'
+                    'account_number'
                 )
 
-    def parse_transaction(self, ns, node, transaction):
+    def parse_transaction(self, ns, node):
         """Parse transaction (entry) node."""
+        transaction = {}
         self.add_value_from_node(
             ns, node, './ns:BkTxCd/ns:Prtry/ns:Cd', transaction,
             'transfer_type'
         )
+        self.add_value_from_node(
+            ns, node, './ns:BookgDt/ns:Dt', transaction, 'date')
         self.add_value_from_node(
             ns, node, './ns:BookgDt/ns:Dt', transaction, 'execution_date')
         self.add_value_from_node(
             ns, node, './ns:ValDt/ns:Dt', transaction, 'value_date')
-        transaction.transferred_amount = self.parse_amount(ns, node)
+
+        transaction['amount'] = self.parse_amount(ns, node)
+
         details_node = node.xpath(
             './ns:NtryDtls/ns:TxDtls', namespaces={'ns': ns})
         if details_node:
             self.parse_transaction_details(ns, details_node[0], transaction)
-        transaction.data = etree.tostring(node)
+        if not transaction.get('name'):
+            self.add_value_from_node(
+                ns, node, './ns:AddtlNtryInf', transaction, 'name')
+        if not transaction.get('name'):
+            transaction['name'] = '/'
+        if not transaction.get('ref'):
+            self.add_value_from_node(
+                ns, node, [
+                    './ns:NtryDtls/ns:Btch/ns:PmtInfId',
+                ],
+                transaction, 'ref'
+            )
+        transaction['data'] = etree.tostring(node)
         return transaction
 
     def get_balance_amounts(self, ns, node):
@@ -172,27 +175,28 @@ class CamtParser(object):
 
     def parse_statement(self, ns, node):
         """Parse a single Stmt node."""
-        statement = BankStatement()
+        result = {}
         self.add_value_from_node(
             ns, node, [
                 './ns:Acct/ns:Id/ns:IBAN',
                 './ns:Acct/ns:Id/ns:Othr/ns:Id',
-            ], statement, 'local_account'
+            ], result, 'account_number'
         )
         self.add_value_from_node(
-            ns, node, './ns:Id', statement, 'statement_id')
+            ns, node, './ns:Id', result, 'name')
+        self.add_value_from_node(
+            ns, node, './ns:Dt', result, 'date')
         self.add_value_from_node(
-            ns, node, './ns:Acct/ns:Ccy', statement, 'local_currency')
-        (statement.start_balance, statement.end_balance) = (
+            ns, node, './ns:Acct/ns:Ccy', result, 'currency')
+        result['balance_start'], result['balance_end_real'] = (
             self.get_balance_amounts(ns, node))
         transaction_nodes = node.xpath('./ns:Ntry', namespaces={'ns': ns})
+        result['transactions'] = []
         for entry_node in transaction_nodes:
-            transaction = statement.create_transaction()
-            self.parse_transaction(ns, entry_node, transaction)
-        if statement['transactions']:
-            statement.date = datetime.strptime(
-                statement['transactions'][0].execution_date, "%Y-%m-%d")
-        return statement
+            transaction = self.parse_transaction(ns, entry_node)
+            if transaction:
+                result['transactions'].append(transaction)
+        return result
 
     def check_version(self, ns, root):
         """Validate validity of camt file."""
@@ -232,8 +236,14 @@ class CamtParser(object):
         ns = root.tag[1:root.tag.index("}")]
         self.check_version(ns, root)
         statements = []
+        currency = None
+        account_number = None
         for node in root[0][1:]:
             statement = self.parse_statement(ns, node)
             if len(statement['transactions']):
+                if 'currency' in statement:
+                    currency = statement.pop('currency')
+                if 'account_number' in statement:
+                    account_number = statement.pop('account_number')
                 statements.append(statement)
-        return statements
+        return currency, account_number, statements
diff --git a/account_bank_statement_import_camt/demo/demo_data.xml b/account_bank_statement_import_camt/demo/demo_data.xml
deleted file mode 100644
index 7fc44d7..0000000
--- a/account_bank_statement_import_camt/demo/demo_data.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="camt_bank_journal" model="account.journal">
-            <field name="name">Bank Journal - (test camt)</field>
-            <field name="code">TBNKCAMT</field>
-            <field name="type">bank</field>
-            <field name="sequence_id" ref="account.sequence_bank_journal"/>
-            <field name="default_debit_account_id" ref="account.bnk"/>
-            <field name="default_credit_account_id" ref="account.bnk"/>
-            <field name="user_id" ref="base.user_root"/>
-        </record>
-
-        <record id="camt_company_bank" model="res.partner.bank">
-            <field name="owner_name">Your Company</field>
-            <field name="acc_number">NL77ABNA0574908765</field>
-            <field name="partner_id" ref="base.partner_root"></field>
-            <field name="company_id" ref="base.main_company"></field>
-            <field name="journal_id" ref="camt_bank_journal"></field>
-            <field name="state">bank</field>
-            <field name="bank" ref="base.res_bank_1"/>
-        </record>
-    </data>
-
-</openerp>
diff --git a/account_bank_statement_import_camt/i18n/de.po b/account_bank_statement_import_camt/i18n/de.po
new file mode 100644
index 0000000..b503264
--- /dev/null
+++ b/account_bank_statement_import_camt/i18n/de.po
@@ -0,0 +1,24 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_bank_statement_import_camt
+#
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-statement-import (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-24 21:51+0000\n"
+"PO-Revision-Date: 2015-10-04 11:43+0200\n"
+"Last-Translator: Rudolf Schnapka <rs@techno-flex.de>\n"
+"Language-Team: French (http://www.transifex.com/oca/OCA-bank-statement-import-8-0/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.8.3\n"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.model,name:account_bank_statement_import_camt.model_account_bank_statement_import
+msgid "Import Bank Statement"
+msgstr "Kontoauszug importieren"
diff --git a/account_bank_statement_import_camt/i18n/fi.po b/account_bank_statement_import_camt/i18n/fi.po
new file mode 100644
index 0000000..09b901e
--- /dev/null
+++ b/account_bank_statement_import_camt/i18n/fi.po
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_bank_statement_import_camt
+# 
+# Translators:
+# Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-10 05:00+0000\n"
+"PO-Revision-Date: 2016-12-10 05:00+0000\n"
+"Last-Translator: Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2017\n"
+"Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.ui.view,arch_db:account_bank_statement_import_camt.account_bank_statement_import_view
+msgid "CAMT"
+msgstr ""
+
+#. module: account_bank_statement_import_camt
+#: model:ir.model,name:account_bank_statement_import_camt.model_account_bank_statement_import
+msgid "Import Bank Statement"
+msgstr "Tuo pankkiaineisto"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.ui.view,arch_db:account_bank_statement_import_camt.account_bank_statement_import_view
+msgid "zipped CAMT"
+msgstr ""
diff --git a/account_bank_statement_import_camt/i18n/fr_CH.po b/account_bank_statement_import_camt/i18n/fr_CH.po
new file mode 100644
index 0000000..3b8e813
--- /dev/null
+++ b/account_bank_statement_import_camt/i18n/fr_CH.po
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_bank_statement_import_camt
+# 
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-09 17:00+0000\n"
+"PO-Revision-Date: 2016-12-09 17:00+0000\n"
+"Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
+"Language-Team: French (Switzerland) (https://www.transifex.com/oca/teams/23907/fr_CH/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: fr_CH\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.ui.view,arch_db:account_bank_statement_import_camt.account_bank_statement_import_view
+msgid "CAMT"
+msgstr ""
+
+#. module: account_bank_statement_import_camt
+#: model:ir.model,name:account_bank_statement_import_camt.model_account_bank_statement_import
+msgid "Import Bank Statement"
+msgstr "Importer Relevé"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.ui.view,arch_db:account_bank_statement_import_camt.account_bank_statement_import_view
+msgid "zipped CAMT"
+msgstr ""
diff --git a/account_bank_statement_import_camt/i18n/gl.po b/account_bank_statement_import_camt/i18n/gl.po
new file mode 100644
index 0000000..7ac52f6
--- /dev/null
+++ b/account_bank_statement_import_camt/i18n/gl.po
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_bank_statement_import_camt
+# 
+# Translators:
+# Alejandro Santana <alejandrosantana@anubia.es>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-09 17:00+0000\n"
+"PO-Revision-Date: 2016-12-09 17:00+0000\n"
+"Last-Translator: Alejandro Santana <alejandrosantana@anubia.es>, 2016\n"
+"Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.ui.view,arch_db:account_bank_statement_import_camt.account_bank_statement_import_view
+msgid "CAMT"
+msgstr ""
+
+#. module: account_bank_statement_import_camt
+#: model:ir.model,name:account_bank_statement_import_camt.model_account_bank_statement_import
+msgid "Import Bank Statement"
+msgstr "Importar extracto bancario"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.ui.view,arch_db:account_bank_statement_import_camt.account_bank_statement_import_view
+msgid "zipped CAMT"
+msgstr ""
diff --git a/account_bank_statement_import_camt/i18n/nb_NO.po b/account_bank_statement_import_camt/i18n/nb_NO.po
new file mode 100644
index 0000000..8b0659a
--- /dev/null
+++ b/account_bank_statement_import_camt/i18n/nb_NO.po
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_bank_statement_import_camt
+# 
+# Translators:
+# Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 9.0c\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-12-09 17:00+0000\n"
+"PO-Revision-Date: 2016-12-09 17:00+0000\n"
+"Last-Translator: Imre Kristoffer Eilertsen <imreeil42@gmail.com>, 2016\n"
+"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/oca/teams/23907/nb_NO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: nb_NO\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.ui.view,arch_db:account_bank_statement_import_camt.account_bank_statement_import_view
+msgid "CAMT"
+msgstr ""
+
+#. module: account_bank_statement_import_camt
+#: model:ir.model,name:account_bank_statement_import_camt.model_account_bank_statement_import
+msgid "Import Bank Statement"
+msgstr "Importer bankutsagn"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.ui.view,arch_db:account_bank_statement_import_camt.account_bank_statement_import_view
+msgid "zipped CAMT"
+msgstr ""
diff --git a/account_bank_statement_import_camt/i18n/pt_PT.po b/account_bank_statement_import_camt/i18n/pt_PT.po
new file mode 100644
index 0000000..7b0f8e8
--- /dev/null
+++ b/account_bank_statement_import_camt/i18n/pt_PT.po
@@ -0,0 +1,23 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * account_bank_statement_import_camt
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: bank-statement-import (8.0)\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-08-18 10:27+0000\n"
+"PO-Revision-Date: 2015-07-24 07:41+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/oca/OCA-bank-statement-import-8-0/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: account_bank_statement_import_camt
+#: model:ir.model,name:account_bank_statement_import_camt.model_account_bank_statement_import
+msgid "Import Bank Statement"
+msgstr "Importar Extrato Bancário"
diff --git a/account_bank_statement_import_camt/models/__init__.py b/account_bank_statement_import_camt/models/__init__.py
new file mode 100644
index 0000000..44b3362
--- /dev/null
+++ b/account_bank_statement_import_camt/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# © 2013-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from . import account_bank_statement_import
diff --git a/account_bank_statement_import_camt/models/account_bank_statement_import.py b/account_bank_statement_import_camt/models/account_bank_statement_import.py
new file mode 100644
index 0000000..0d6f928
--- /dev/null
+++ b/account_bank_statement_import_camt/models/account_bank_statement_import.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+"""Add process_camt method to account.bank.statement.import."""
+# © 2013-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+import logging
+import StringIO
+import zipfile
+from odoo import api, models
+from ..camt import CamtParser as Parser
+
+_logger = logging.getLogger(__name__)
+
+
+class AccountBankStatementImport(models.TransientModel):
+    """Add process_camt method to account.bank.statement.import."""
+    _inherit = 'account.bank.statement.import'
+
+    @api.model
+    def _parse_file(self, data_file):
+        """Parse a CAMT053 XML file."""
+        try:
+            parser = Parser()
+            _logger.debug("Try parsing with camt.")
+            return parser.parse(data_file)
+        except ValueError:
+            try:
+                with zipfile.ZipFile(StringIO.StringIO(data_file)) as data:
+                    currency = None
+                    account_number = None
+                    transactions = []
+                    for member in data.namelist():
+                        currency, account_number, new = self._parse_file(
+                            data.open(member).read()
+                        )
+                        transactions.extend(new)
+                return currency, account_number, transactions
+            except (zipfile.BadZipfile, ValueError):
+                pass
+            # Not a camt file, returning super will call next candidate:
+            _logger.debug("Statement file was not a camt file.",
+                          exc_info=True)
+        return super(AccountBankStatementImport, self)._parse_file(data_file)
diff --git a/account_bank_statement_import_camt/test_files/test-camt053.xml b/account_bank_statement_import_camt/test_files/test-camt053
similarity index 92%
rename from account_bank_statement_import_camt/test_files/test-camt053.xml
rename to account_bank_statement_import_camt/test_files/test-camt053
index 1d74d81..4a2a047 100644
--- a/account_bank_statement_import_camt/test_files/test-camt053.xml
+++ b/account_bank_statement_import_camt/test_files/test-camt053
@@ -2,15 +2,15 @@
     <BkToCstmrStmt>
         <GrpHdr>
             <MsgId>TESTBANK/NL/1420561226673</MsgId>
-            <CreDtTm>2013-01-06T16:20:26.673Z</CreDtTm>
+            <CreDtTm>2014-01-06T16:20:26.673Z</CreDtTm>
         </GrpHdr>
         <Stmt>
             <Id>1234Test/1</Id>
             <LglSeqNb>2</LglSeqNb>
-            <CreDtTm>2013-01-06T16:20:26.673Z</CreDtTm>
+            <CreDtTm>2014-01-06T16:20:26.673Z</CreDtTm>
             <FrToDt>
-                <FrDtTm>2013-01-05T00:00:00.000Z</FrDtTm>
-                <ToDtTm>2013-01-05T23:59:59.999Z</ToDtTm>
+                <FrDtTm>2014-01-05T00:00:00.000Z</FrDtTm>
+                <ToDtTm>2014-01-05T23:59:59.999Z</ToDtTm>
             </FrToDt>
             <Acct>
                 <Id>
@@ -32,7 +32,7 @@
                 <Amt Ccy="EUR">15568.27</Amt>
                 <CdtDbtInd>CRDT</CdtDbtInd>
                 <Dt>
-                    <Dt>2013-01-05</Dt>
+                    <Dt>2014-01-05</Dt>
                 </Dt>
             </Bal>
             <Bal>
@@ -44,7 +44,7 @@
                 <Amt Ccy="EUR">15121.12</Amt>
                 <CdtDbtInd>CRDT</CdtDbtInd>
                 <Dt>
-                    <Dt>2013-01-05</Dt>
+                    <Dt>2014-01-05</Dt>
                 </Dt>
             </Bal>
             <Ntry>
@@ -52,10 +52,10 @@
                 <CdtDbtInd>DBIT</CdtDbtInd>
                 <Sts>BOOK</Sts>
                 <BookgDt>
-                    <Dt>2013-01-05</Dt>
+                    <Dt>2014-01-05</Dt>
                 </BookgDt>
                 <ValDt>
-                    <Dt>2013-01-05</Dt>
+                    <Dt>2014-01-05</Dt>
                 </ValDt>
                 <BkTxCd>
                     <Domn>
@@ -104,9 +104,9 @@
                             </CdtrAgt>
                         </RltdAgts>
                         <RmtInf>
-                            <Ustrd>Insurance policy 857239PERIOD 01.01.2013 - 31.12.2013</Ustrd>
+                            <Ustrd>Insurance policy 857239PERIOD 01.01.2014 - 31.12.2014</Ustrd>
                         </RmtInf>
-                        <AddtlTxInf>MKB Insurance 859239PERIOD 01.01.2013 - 31.12.2013</AddtlTxInf>
+                        <AddtlTxInf>MKB Insurance 859239PERIOD 01.01.2014 - 31.12.2014</AddtlTxInf>
                     </TxDtls>
                 </NtryDtls>
             </Ntry>
@@ -116,10 +116,10 @@
                 <RvslInd>true</RvslInd>
                 <Sts>BOOK</Sts>
                 <BookgDt>
-                    <Dt>2013-01-05</Dt>
+                    <Dt>2014-01-05</Dt>
                 </BookgDt>
                 <ValDt>
-                    <Dt>2013-01-05</Dt>
+                    <Dt>2014-01-05</Dt>
                 </ValDt>
                 <BkTxCd>
                     <Domn>
@@ -182,10 +182,10 @@
                 <CdtDbtInd>CRDT</CdtDbtInd>
                 <Sts>BOOK</Sts>
                 <BookgDt>
-                    <Dt>2013-01-05</Dt>
+                    <Dt>2014-01-05</Dt>
                 </BookgDt>
                 <ValDt>
-                    <Dt>2013-01-05</Dt>
+                    <Dt>2014-01-05</Dt>
                 </ValDt>
                 <BkTxCd>
                     <Domn>
@@ -202,7 +202,7 @@
                 <NtryDtls>
                     <TxDtls>
                         <Refs>
-                            <InstrId>INNDNL2U20130105000217200000708</InstrId>
+                            <InstrId>INNDNL2U20140105000217200000708</InstrId>
                             <EndToEndId>115</EndToEndId>
                         </Refs>
                         <AmtDtls>
diff --git a/account_bank_statement_import_camt/test_files/test-camt053.zip b/account_bank_statement_import_camt/test_files/test-camt053.zip
new file mode 100644
index 0000000..ccf5b3c
Binary files /dev/null and b/account_bank_statement_import_camt/test_files/test-camt053.zip differ
diff --git a/account_bank_statement_import_camt/tests/__init__.py b/account_bank_statement_import_camt/tests/__init__.py
index cd97bca..06d3af2 100644
--- a/account_bank_statement_import_camt/tests/__init__.py
+++ b/account_bank_statement_import_camt/tests/__init__.py
@@ -1,23 +1,5 @@
 # -*- encoding: utf-8 -*-
 """Test import of bank statement for camt.053."""
-##############################################################################
-#
-#    Copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    All other contributions are (C) by their respective contributors
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# © 2013-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 from . import test_import_bank_statement
diff --git a/account_bank_statement_import_camt/tests/test_import_bank_statement.py b/account_bank_statement_import_camt/tests/test_import_bank_statement.py
index 8a1694f..b3c57aa 100644
--- a/account_bank_statement_import_camt/tests/test_import_bank_statement.py
+++ b/account_bank_statement_import_camt/tests/test_import_bank_statement.py
@@ -1,45 +1,69 @@
 # -*- coding: utf-8 -*-
 """Run test to import camt.053 import."""
-##############################################################################
-#
-#    Copyright (C) 2015 Therp BV <http://therp.nl>.
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-from openerp.addons.account_bank_statement_import.tests import (
-    TestStatementFile)
+# © 2013-2016 Therp BV <http://therp.nl>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+import base64
+from odoo.tests.common import TransactionCase
+from odoo.tools.misc import file_open
 
 
-class TestImport(TestStatementFile):
+class TestImport(TransactionCase):
     """Run test to import camt import."""
+    transactions = [
+        {
+            'account_number': 'NL46ABNA0499998748',
+            'amount': -754.25,
+            'date': '2014-01-05',
+            'ref': '435005714488-ABNO33052620',
+        },
+    ]
+
+    def setUp(self):
+        super(TestImport, self).setUp()
+        bank = self.env['res.partner.bank'].create({
+            'acc_number': 'NL77ABNA0574908765',
+            'partner_id': self.env.ref('base.main_partner').id,
+            'company_id': self.env.ref('base.main_company').id,
+            'bank_id': self.env.ref('base.res_bank_1').id,
+        })
+        self.env['account.journal'].create({
+            'name': 'Bank Journal - (test camt)',
+            'code': 'TBNKCAMT',
+            'type': 'bank',
+            'bank_account_id': bank.id,
+        })
 
     def test_statement_import(self):
         """Test correct creation of single statement."""
-        transactions = [
-            {
-                'remote_account': 'NL46ABNA0499998748',
-                'transferred_amount': -754.25,
-                'value_date': '2013-01-05',
-                'ref': '435005714488-ABNO33052620',
-            },
-        ]
-        # statement name is account number + '-' + date of last 62F line:
-        self._test_statement_import(
-            'account_bank_statement_import_camt', 'test-camt053.xml',
-            '1234Test/1',
-            local_account='NL77ABNA0574908765',
-            start_balance=15568.27, end_balance=15121.12,
-            transactions=transactions
-        )
+        action = {}
+        with file_open(
+            'account_bank_statement_import_camt/test_files/test-camt053'
+        ) as testfile:
+            action = self.env['account.bank.statement.import'].create({
+                'data_file': base64.b64encode(testfile.read()),
+            }).import_file()
+        for statement in self.env['account.bank.statement'].browse(
+            action['context']['statement_ids']
+        ):
+            self.assertTrue(any(
+                all(
+                    line[key] == self.transactions[0][key]
+                    for key in ['amount', 'date', 'ref']
+                ) and
+                line.bank_account_id.acc_number ==
+                self.transactions[0]['account_number']
+                for line in statement.line_ids
+            ))
+
+    def test_zip_import(self):
+        """Test import of multiple statements from zip file."""
+        with file_open(
+            'account_bank_statement_import_camt/test_files/test-camt053.zip'
+        ) as testfile:
+            action = self.env['account.bank.statement.import'].create({
+                'data_file': base64.b64encode(testfile.read()),
+            }).import_file()
+        for statement in self.env['account.bank.statement'].browse(
+            action['context']['statement_ids']
+        ):
+            self.assertTrue(statement.line_ids)
diff --git a/account_bank_statement_import_camt/views/account_bank_statement_import.xml b/account_bank_statement_import_camt/views/account_bank_statement_import.xml
new file mode 100644
index 0000000..92d3c08
--- /dev/null
+++ b/account_bank_statement_import_camt/views/account_bank_statement_import.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="account_bank_statement_import_view" model="ir.ui.view">
+        <field name="model">account.bank.statement.import</field>
+        <field name="inherit_id" ref="account_bank_statement_import.account_bank_statement_import_view" />
+        <field name="arch" type="xml">
+            <ul id="statement_format" position="inside">
+                <li>CAMT</li>
+                <li>zipped CAMT</li>
+            </ul>
+        </field>
+    </record>
+</odoo>