diff --git a/.gitignore b/.gitignore
index 6c605a4..5fb9eac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
 *~
 .dir-locals.el
 .sconf_temp
 .sconsign.dblite
 *.log
 build*
 __pycache__
 *.pyc
 site_scons/site_tools/doxygen
 .*cache
 compile_commands*.json
+.coverage
\ No newline at end of file
diff --git a/python/SConscript b/python/SConscript
index 85436ce..e4b5322 100644
--- a/python/SConscript
+++ b/python/SConscript
@@ -1,143 +1,144 @@
 # -*- mode:python; coding: utf-8 -*-
 # vim: set ft=python:
 
 # @file
 # @section LICENSE
 #
 # Copyright (©) 2016-2020 EPFL (École Polytechnique Fédérale de Lausanne),
 # Laboratory (LSMS - Laboratoire de Simulation en Mécanique des Solides)
 #
 # 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 <https://www.gnu.org/licenses/>.
 
 from __future__ import print_function
 
 from os.path import abspath, join
 from SCons.Script import Import, Split, Copy, Dir
 
 Import('main_env')
 
 # Pybind11 wrapper
 env_pybind = main_env.Clone(SHLIBPREFIX='')
 
 # Remove pedantic warnings
 cxx_flags = env_pybind['CXXFLAGS']
 try:
     del cxx_flags[cxx_flags.index('-pedantic')]
 except ValueError:
     pass
 
 env_pybind.Tool(pybind11)
 
 pybind_sources = Split("""
 tamaas_module.cpp
 wrap/core.cpp
 wrap/percolation.cpp
 wrap/surface.cpp
 wrap/model.cpp
 wrap/solvers.cpp
 wrap/compute.cpp
 wrap/test_features.cpp
 """)
 
 # Adding legacy wrap code
 if main_env['legacy_bem']:
     pybind_sources += ["wrap/bem.cpp"]
 
 # Building the pybind library
 tamaas_wrap = env_pybind.Pybind11Module(
     target='tamaas/_tamaas',
     source=pybind_sources,
     LIBS=['Tamaas'],
 )
 
 # For some reason link happens too early
 Import('libTamaas')
 env_pybind.Depends(tamaas_wrap, libTamaas)
 
 # Copying the __init__.py file with extra python classes
 copy_env = env_pybind.Clone()
 
 
 # Copying additional python files
 
 python_files = """
 compute.py
 dumpers/__init__.py
 dumpers/_helper.py
 nonlinear_solvers/__init__.py
 """.split()
 
 targets = [tamaas_wrap]
 targets += [
     copy_env.Command(join('tamaas', f),
                      join(abspath(str(Dir('#python/tamaas'))), f),
                      Copy("$TARGET", "$SOURCE"))
     for f in python_files
 ]
 
 targets.append(copy_env.Command('MANIFEST.in', '#python/MANIFEST.in',
                                 Copy("$TARGET", "$SOURCE")))
 
 
 subst_env = env_pybind.Clone(
     SUBST_DICT={
         '@version@': '$version',
         '@authors@': str(copy_env['authors']),
         '@email@': '$email',
         # TODO change when issue with unicode fixed
         # '@copyright@': '$copyright',
         # '@maintainer@': '$maintainer',
     }
 )
 subst_env.Tool('textfile')
 
 targets.append(subst_env.Substfile('setup.py.in'))
 targets.append(subst_env.Substfile('tamaas/__init__.py.in'))
 
 # Defining alias for python builds
 main_env.Alias('build-python', targets)
 
 # Checking if we can use pip to install (more convenient for end-user)
 conf = Configure(main_env, custom_tests={'CheckPythonModule': CheckPythonModule})
 has_pip = conf.CheckPythonModule('pip')
 install_env = conf.Finish()
 
 # Current build directory
 install_env['PYDIR'] = Dir('.')
 
 # Setting command line for installation
 if has_pip:
     install_env['PYINSTALLCOM'] = '${py_exec} -m pip install $PYOPTIONS .'
-    install_env['PYDEVELOPCOM'] = '${py_exec} -m pip install $PYOPTIONS -e .'
+    install_env['PYDEVELOPCOM'] = \
+        '${py_exec} -m pip install $PYOPTIONS -e .[solvers,dumpers]'
 else:
     install_env['PYINSTALLCOM'] = '${py_exec} setup.py install $PYOPTIONS'
     install_env['PYDEVELOPCOM'] = '${py_exec} setup.py develop $PYOPTIONS'
     install_env['py_version'] = get_python_version(install_env)
     install_env.PrependENVPath(
         'PYTHONPATH',
         install_env.subst('${prefix}/lib/python${py_version}/site-packages'))
 
 # Specify install target
 python_install = install_env.Command(
     join('$prefix', 'dummy_target'),
     targets, install_env['PYINSTALLCOM'], PYOPTIONS='--prefix ${prefix}',
     chdir=install_env['PYDIR'])
 
 python_install_dev = install_env.Command(
     join('$prefix', 'dummy_target_local'),
     targets, install_env['PYDEVELOPCOM'], PYOPTIONS='--user',
     chdir=install_env['PYDIR'])
 
 main_env.Alias('install-python', python_install)
 main_env.Alias('dev', python_install_dev)
diff --git a/python/setup.py.in b/python/setup.py.in
index e63ce4c..cb35335 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -1,27 +1,27 @@
 import setuptools
 import sysconfig
 import os
 
 setuptools.setup(
     name="tamaas",
     version="@version@",
 
     packages=setuptools.find_packages(),
     include_package_data=True,
     author=@authors@,
     author_email="@email@",
     description='A fast rough contact library',
     url="https://c4science.ch/project/view/2036/",
     install_requires=['numpy'],
-    extra_require={
-        "VTK": ['uvw'],
-        "FEM": ['akantu'],
+    extras_require={
+        "dumpers": ['uvw', 'h5py', 'netCDF4'],
+        "solvers": ['scipy'],
     },
     classifiers=[
         "Intended Audience :: Science/Research",
         "License :: OSI Approved :: GNU Affero General Public License v3",
         "Programming Language :: C++",
         "Programming Language :: Python :: 3",
         "Topic :: Scientific/Engineering",
     ]
 )