diff --git a/b/bzip2/bzip2-1.0.6.eb b/b/bzip2/bzip2-1.0.6.eb
index ebee483a..9f050ebe 100644
--- a/b/bzip2/bzip2-1.0.6.eb
+++ b/b/bzip2/bzip2-1.0.6.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2019
+
 name = 'bzip2'
 version = '1.0.6'
 
@@ -6,11 +8,11 @@ description = """bzip2 is a freely available, patent free, high-quality data com
 compresses files to within 10% to 15% of the best available techniques (the PPM family of statistical
 compressors), whilst being around twice as fast at compression and six times faster at decompression."""
 
-toolchain = {'name': 'system', 'version': ''}
+toolchain = SYSTEM
 toolchainopts = {'pic': True}
 
-sources = [SOURCE_TAR_GZ]
-source_urls = ['http://www.bzip.org/%(version)s/']
+sources = ['bzip2-1.0.6.tar.gz']
+source_urls = ['https://src.fedoraproject.org/lookaside/pkgs/bzip2/bzip2-1.0.6.tar.gz/00b516f4704d4a7cb50a1d97e6e8e15b/']
 
 buildopts = "CC=gcc CFLAGS='-Wall -Winline -O3 -fPIC -g $(BIGFILES)'"
 
diff --git a/c/CUDA/CUDA-10.1.243.eb b/c/CUDA/CUDA-10.1.243.eb
new file mode 100644
index 00000000..8e9c1e6b
--- /dev/null
+++ b/c/CUDA/CUDA-10.1.243.eb
@@ -0,0 +1,18 @@
+# IT4Innovations 2019
+
+name = 'CUDA'
+version = '10.1.243'
+
+homepage = 'https://developer.nvidia.com/cuda-toolkit'
+description = """CUDA (formerly Compute Unified Device Architecture) is a parallel
+ computing platform and programming model created by NVIDIA and implemented by the
+ graphics processing units (GPUs) that they produce. CUDA gives developers access
+ to the virtual instruction set and memory of the parallel computational elements in CUDA GPUs."""
+
+toolchain = SYSTEM
+
+source_urls = ['https://developer.download.nvidia.com/compute/cuda/%(version_major_minor)s/Prod/local_installers/']
+sources = ['%(namelower)s_%(version)s_418.87.00_linux.run']
+checksums = ['e7c22dc21278eb1b82f34a60ad7640b41ad3943d929bebda3008b72536855d31']
+
+moduleclass = 'system'
diff --git a/c/cuDNN/cuDNN-7.6.4.38-CUDA-10.1.243.eb b/c/cuDNN/cuDNN-7.6.4.38-CUDA-10.1.243.eb
new file mode 100644
index 00000000..1e237d3a
--- /dev/null
+++ b/c/cuDNN/cuDNN-7.6.4.38-CUDA-10.1.243.eb
@@ -0,0 +1,31 @@
+# IT4Innovations 2019
+
+easyblock = 'Tarball'
+
+name = 'cuDNN'
+version = '7.6.4.38'
+local_cuda_version = '10.1.243'
+
+local_cuda_version_major_minor = '.'.join(local_cuda_version.split('.')[:2])
+
+versionsuffix = '-CUDA-%s' % local_cuda_version
+
+homepage = 'https://developer.nvidia.com/cudnn'
+description = """The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for
+    deep neural networks."""
+
+toolchain = SYSTEM
+
+# Nvidia developer registration required.
+# Download link: https://developer.nvidia.com/rdp/cudnn-download
+sources = ['%%(namelower)s-%s-linux-x64-v%%(version)s.tgz' % local_cuda_version_major_minor]
+checksums = ['457d052f249cb571ebee3eb5ad29685c']
+
+dependencies = [('CUDA', local_cuda_version)]
+
+sanity_check_paths = {
+    'files': ['include/cudnn.h', 'lib64/libcudnn_static.a'],
+    'dirs': ['include', 'lib64'],
+}
+
+moduleclass = 'numlib'
diff --git a/l/libreadline/libreadline-7.0.eb b/l/libreadline/libreadline-7.0.eb
index b7991893..2a36c359 100644
--- a/l/libreadline/libreadline-7.0.eb
+++ b/l/libreadline/libreadline-7.0.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2019
+
 easyblock = 'ConfigureMake'
 
 name = 'libreadline'
@@ -9,13 +11,13 @@ description = """The GNU Readline library provides a set of functions for use by
  The Readline library includes additional functions to maintain a list of previously-entered command lines,
  to recall and perhaps reedit those lines, and perform csh-like history expansion on previous commands."""
 
-toolchain = {'name': 'system', 'version': ''}
+toolchain = SYSTEM
 toolchainopts = {'pic': True}
 
 sources = ['readline-%(version)s.tar.gz']
 source_urls = ['http://ftp.gnu.org/gnu/readline']
 
-dependencies = [('ncurses', '6.0')]
+dependencies = [('ncurses', '6.1')]
 
 sanity_check_paths = {
     'files': [
diff --git a/n/numactl/numactl-2.0.12-GCCcore-8.2.0.eb b/n/numactl/numactl-2.0.12-GCCcore-8.2.0.eb
index c4efbd02..32a4ce0d 100644
--- a/n/numactl/numactl-2.0.12-GCCcore-8.2.0.eb
+++ b/n/numactl/numactl-2.0.12-GCCcore-8.2.0.eb
@@ -1,3 +1,5 @@
+# IT4Innovations 2019
+
 easyblock = 'ConfigureMake'
 
 name = 'numactl'
@@ -20,8 +22,8 @@ sources = ['v%(version)s.tar.gz']
 checksums = ['7c3e819c2bdeb883de68bafe88776a01356f7ef565e75ba866c4b49a087c6bdf']
 
 builddependencies = [
-    ('binutils', '2.31.1'),
-    ('Autotools', '20180311'),
+    ('binutils', '2.32'),
+    ('Autotools', '20180311', '', True),
 ]
 
 preconfigopts = "./autogen.sh && "
diff --git a/n/numactl/numactl-2.0.12-GCCcore-8.3.0.eb b/n/numactl/numactl-2.0.12-GCCcore-8.3.0.eb
new file mode 100644
index 00000000..088aa45e
--- /dev/null
+++ b/n/numactl/numactl-2.0.12-GCCcore-8.3.0.eb
@@ -0,0 +1,36 @@
+# IT4Innovations 2019
+
+easyblock = 'ConfigureMake'
+
+name = 'numactl'
+version = '2.0.12'
+
+homepage = 'http://oss.sgi.com/projects/libnuma/'
+
+description = """
+ The numactl program allows you to run your application program on specific
+ cpu's and memory nodes. It does this by supplying a NUMA memory policy to
+ the operating system before running your program. The libnuma library provides
+ convenient ways for you to add NUMA memory policies into your own program.
+"""
+
+toolchain = {'name': 'GCCcore', 'version': '8.3.0'}
+toolchainopts = {'pic': True}
+
+source_urls = ['https://github.com/numactl/numactl/archive/']
+sources = ['v%(version)s.tar.gz']
+checksums = ['7c3e819c2bdeb883de68bafe88776a01356f7ef565e75ba866c4b49a087c6bdf']
+
+builddependencies = [
+    ('binutils', '2.32'),
+    ('Autotools', '20180311', '', True),
+]
+
+preconfigopts = "./autogen.sh && "
+
+sanity_check_paths = {
+    'files': ['bin/numactl', 'bin/numastat', 'lib/libnuma.%s' % SHLIB_EXT, 'lib/libnuma.a'],
+    'dirs': ['share/man', 'include']
+}
+
+moduleclass = 'tools'
diff --git a/p/PGI/PGI-19.7-GCC-8.3.0-2.32.eb b/p/PGI/PGI-19.7-GCC-8.3.0-2.32.eb
new file mode 100644
index 00000000..a246ae5a
--- /dev/null
+++ b/p/PGI/PGI-19.7-GCC-8.3.0-2.32.eb
@@ -0,0 +1,39 @@
+# IT4Innovations 2019
+
+name = 'PGI'
+version = '19.7'
+
+homepage = 'http://www.pgroup.com/'
+description = "C, C++ and Fortran compilers from The Portland Group - PGI"
+
+toolchain = SYSTEM
+
+sources = ['pgilinux-20%(version_major)s-%(version_major)s%(version_minor)s-x86-64.tar.gz']
+
+gccver = '8.3.0'
+binutilsver = '2.32'
+versionsuffix = '-GCC-%s-%s' % (gccver, binutilsver)
+
+dependencies = [
+    ('GCCcore', gccver),
+    ('binutils', binutilsver, '', ('GCCcore', gccver)),
+    ('numactl', '2.0.12', '', ('GCCcore', gccver)),
+]
+
+configopts = 'export PGI_INSTALL_MPI=true &&'
+
+# license file
+license_file = '/apps/licenses/pgi/license.dat'
+
+modextrapaths = {
+    'PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/bin',
+    'LD_LIBRARY_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib',
+    'LIBRARY_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib',
+    'CPATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/include',
+    'MANPATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/share/man',
+    'PKG_CONFIG_PATH': 'linux86-64-llvm/2019/mpi/openmpi-3.1.3/lib/pkgconfig',
+    'OMPI_MCA_btl_openib_if_include': 'mlx4_0',
+    'OMPI_MCA_oob_tcp_if_include': '10.0.0.0/8',
+}
+
+moduleclass = 'compiler'
diff --git a/p/Py/Py-2.7.eb b/p/Py/Py-2.7.eb
index 0664da2e..ee4bf717 100644
--- a/p/Py/Py-2.7.eb
+++ b/p/Py/Py-2.7.eb
@@ -1,4 +1,4 @@
-# IT4Innovations 2018
+# IT4Innovations 2019
 
 easyblock = "Toolchain"
 
@@ -8,11 +8,10 @@ version = '2.7'
 homepage = 'https://www.python.org'
 description = """Python 2.7 toolchain"""
 
-toolchain = {'name': 'system', 'version': ''}
+toolchain = SYSTEM
 
 dependencies = [
-    ('Python', '2.7.14', '-base', ('GCC', '6.3.0-2.27')),
-    ('GCC', '6.3.0-2.27'),
+    ('Python', '2.7.17', '-base'),
 ]
 
 moduleclass = 'toolchain'
diff --git a/p/Py/Py-3.6.eb b/p/Py/Py-3.6.eb
index 846f3aec..33dd77ff 100644
--- a/p/Py/Py-3.6.eb
+++ b/p/Py/Py-3.6.eb
@@ -1,4 +1,4 @@
-# IT4Innovations 2018
+# IT4Innovations 2019
 
 easyblock = "Toolchain"
 
@@ -8,11 +8,10 @@ version = '3.6'
 homepage = 'https://www.python.org'
 description = """Python 3.6 toolchain"""
 
-toolchain = {'name': 'system', 'version': ''}
+toolchain = SYSTEM
 
 dependencies = [
-    ('Python', '3.6.8', '-base', ('GCC', '6.3.0-2.27')),
-    ('GCC', '6.3.0-2.27'),
+    ('Python', '3.6.9', '-base'),
 ]
 
 moduleclass = 'toolchain'
diff --git a/p/Python/Python-2.7.17-base.eb b/p/Python/Python-2.7.17-base.eb
new file mode 100644
index 00000000..05368c86
--- /dev/null
+++ b/p/Python/Python-2.7.17-base.eb
@@ -0,0 +1,43 @@
+# IT4Innovations 2019
+
+easyblock = "EB_Python"
+name = 'Python'
+version = '2.7.17'
+versionsuffix = '-base'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('zlib', '1.2.11'),
+    ('libreadline', '7.0'),
+    ('ncurses', '6.1'),
+    ('SQLite', '3.17.0'),
+    ('Tk', '8.6.6'),
+]
+
+osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+#buildopts = 'CPPFLAGS="-I/apps/all/bzip2/1.0.6/include -I/apps/all/zlib/1.2.8/include -I/apps/all/ncurses/5.9/include -I/apps/all/SQLite/3.8.8.1/include" LDFLAGS="-L/apps/all/bzip2/1.0.6/lib -L/apps/all/zlib/1.2.8/lib -L/apps/all/ncurses/5.9/lib -L/apps/all/SQLite/3.8.8.1/lib:$CPPFLAGS"'
+
+exts_list = [
+    ('setuptools', '41.6.0', {
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+        'source_tmpl': '%(name)s-%(version)s.zip',
+    }),
+    ('pip', '19.3.1', {
+        'source_urls': ['http://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['http://pypi.python.org/packages/source/n/nose/'],
+    }),
+]
+
+moduleclass = 'lang'
diff --git a/p/Python/Python-3.6.8-base.eb b/p/Python/Python-3.6.8-base.eb
index 5ea4efcd..7e7154d1 100644
--- a/p/Python/Python-3.6.8-base.eb
+++ b/p/Python/Python-3.6.8-base.eb
@@ -7,7 +7,7 @@ versionsuffix = '-base'
 homepage = 'http://python.org/'
 description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
 
-toolchain = {'name': 'system', 'version': ''}
+toolchain = SYSTEM
 toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
 
 source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
@@ -26,7 +26,7 @@ dependencies = [
     ('GMP', '6.1.2'),
     ('XZ', '5.2.3'),
     ('zlib', '1.2.11'),
-    ('ncurses', '6.0'),
+    ('ncurses', '6.1'),
     #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
     #   nice to have an up to date openssl for security reasons
 ]
@@ -34,12 +34,12 @@ dependencies = [
 #osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
 
 exts_list = [
-    ('setuptools', '40.0.0', {
+    ('setuptools', '41.6.0', {
         'source_tmpl': '%(name)s-%(version)s.zip',
         'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
         'checksums': ['012adb8e25fbfd64c652e99e7bab58799a3aaf05d39ab38561f69190a909015f'],
     }),
-    ('pip', '19.0.1', {
+    ('pip', '19.3.1', {
         'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
     }),
     ('nose', '1.3.7', {
diff --git a/p/Python/Python-3.6.9-base.eb b/p/Python/Python-3.6.9-base.eb
new file mode 100644
index 00000000..fe443c7f
--- /dev/null
+++ b/p/Python/Python-3.6.9-base.eb
@@ -0,0 +1,49 @@
+# IT4Innovations 2019
+
+name = 'Python'
+version = '3.6.9'
+versionsuffix = '-base'
+
+homepage = 'http://python.org/'
+description = "Python is a programming language that lets you work more quickly and integrate your systems more effectively."
+
+toolchain = SYSTEM
+toolchainopts = {'pic': True, 'opt': True, 'optarch': True}
+
+source_urls = ['http://www.python.org/ftp/%(namelower)s/%(version)s/']
+sources = [SOURCE_TGZ]
+
+prebuildopts = 'export CFLAGS="-I${EBROOTXZ}/include" && '
+prebuildopts += 'export LDFLAGS="-L${EBROOTXZ}/lib" && '
+configopts = "--enable-optimizations"
+
+# python needs bzip2 to build the bz2 package
+dependencies = [
+    ('bzip2', '1.0.6'),
+    ('libreadline', '7.0'),
+    ('SQLite', '3.17.0'),
+    ('Tk', '8.6.6'),
+    ('GMP', '6.1.2'),
+    ('XZ', '5.2.3'),
+    ('zlib', '1.2.11'),
+    ('ncurses', '6.1'),
+    #   ('OpenSSL', '1.0.1q'),  # OS dependency should be preferred if the os version is more recent then this version, it's
+    #   nice to have an up to date openssl for security reasons
+]
+
+#osdependencies = [('openssl-devel', 'libssl-dev', 'libopenssl-devel')]
+
+exts_list = [
+    ('setuptools', '41.6.0', {
+        'source_tmpl': '%(name)s-%(version)s.zip',
+        'source_urls': ['https://pypi.python.org/packages/source/s/setuptools/'],
+    }),
+    ('pip', '19.3.1', {
+        'source_urls': ['https://pypi.python.org/packages/source/p/pip/'],
+    }),
+    ('nose', '1.3.7', {
+        'source_urls': ['https://pypi.python.org/packages/source/n/nose/'],
+    }),
+]
+
+moduleclass = 'lang'