diff --git a/esap/accounts/migrations/0001_initial.py b/esap/accounts/migrations/0001_initial.py
new file mode 100644
index 0000000000000000000000000000000000000000..d676f31ea2ee82cb89ffb8e2a483e0c776326b43
--- /dev/null
+++ b/esap/accounts/migrations/0001_initial.py
@@ -0,0 +1,80 @@
+# Generated by Django 3.1.1 on 2020-10-20 10:08
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='EsapComputeResource',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('resource_name', models.CharField(max_length=50, verbose_name='Resource Name')),
+ ('resource_type', models.CharField(max_length=50, verbose_name='Resource Type')),
+ ('resource_url', models.URLField(verbose_name='Resource URL')),
+ ],
+ options={
+ 'verbose_name': 'Compute Resource',
+ 'verbose_name_plural': 'Compute Resources',
+ },
+ ),
+ migrations.CreateModel(
+ name='EsapQuerySchema',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('schema_name', models.CharField(max_length=50, verbose_name='Schema Name')),
+ ],
+ options={
+ 'verbose_name': 'Query Schema',
+ 'verbose_name_plural': 'Query Schemas',
+ },
+ ),
+ migrations.CreateModel(
+ name='EsapShoppingItem',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('item_data', models.JSONField(verbose_name='Item Data')),
+ ],
+ options={
+ 'verbose_name': 'Selected Item',
+ 'verbose_name_plural': 'Selected Items',
+ },
+ ),
+ migrations.CreateModel(
+ name='EsapSoftwareRepository',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('repository_name', models.CharField(max_length=50, verbose_name='Repository Name')),
+ ('repository_type', models.CharField(max_length=50, verbose_name='Repository Type')),
+ ('repository_url', models.URLField(verbose_name='Repository URL')),
+ ],
+ options={
+ 'verbose_name': 'Software Repository',
+ 'verbose_name_plural': 'Software Repositories',
+ },
+ ),
+ migrations.CreateModel(
+ name='EsapUserProfile',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('user_name', models.CharField(max_length=50, verbose_name='Username')),
+ ('full_name', models.CharField(max_length=100, null=True, verbose_name='Full Name')),
+ ('user_email', models.EmailField(max_length=254, verbose_name='User Email')),
+ ('compute_resources', models.ManyToManyField(blank=True, to='accounts.EsapComputeResource', verbose_name='Compute Resources')),
+ ('query_schema', models.ForeignKey(default='esap_default', null=True, on_delete=django.db.models.deletion.SET_NULL, to='accounts.esapqueryschema', verbose_name='Preferred Query Schema')),
+ ('shopping_cart', models.ManyToManyField(blank=True, to='accounts.EsapShoppingItem', verbose_name='Shopping Cart')),
+ ('software_repositories', models.ManyToManyField(blank=True, to='accounts.EsapSoftwareRepository', verbose_name='Software Repositories')),
+ ],
+ options={
+ 'verbose_name': 'User Profile',
+ 'verbose_name_plural': 'User Profiles',
+ },
+ ),
+ ]
diff --git a/esap/esap/esap_config.sqlite3 b/esap/esap/esap_config.sqlite3
index 2b27e48521b3b4ff7e340b015c43431479d63626..612983af3b9a171071197882f74ae37d3968c365 100644
Binary files a/esap/esap/esap_config.sqlite3 and b/esap/esap/esap_config.sqlite3 differ
diff --git a/esap/logs/esap.log b/esap/logs/esap.log
index 37a3469b54d2a7fddf58823415f2aecec9638f7a..7d657ebc81d34599653d57db2394dd53c47e653f 100644
--- a/esap/logs/esap.log
+++ b/esap/logs/esap.log
@@ -6667,3 +6667,38 @@
[2020-10-20 08:45:30,417] query_controller.run_query()
[2020-10-20 08:45:30,424] query_controller.run_query()
[2020-10-20 08:45:30,429] query_controller.run_query()
+[20/Oct/2020 11:26:35,148] query_controller.create_and_run_query()
+[20/Oct/2020 11:26:35,149] query_controller.create_query()
+[20/Oct/2020 11:26:35,156] ERROR: could not translating key collection 'collection', using it raw.
+[20/Oct/2020 11:26:35,156] ERROR: could not translating key page 'page', using it raw.
+[20/Oct/2020 11:26:35,157] construct_query: https://alta.astron.nl/altapi/dataproducts?collection=imaging_and_page=1_and_dataProductSubType__in=calibratedVisibility,continuumMF,continuumChunk,imageCube,beamCube,polarisationImage,polarisationCube,continuumCube_and_page_size=50
+[20/Oct/2020 11:26:35,159] query_controller.run_query()
+[20/Oct/2020 11:26:35,159] run-query: https://alta.astron.nl/altapi/dataproducts?collection=imaging&page=1&dataProductSubType__in=calibratedVisibility,continuumMF,continuumChunk,imageCube,beamCube,polarisationImage,polarisationCube,continuumCube&page_size=50
+[20/Oct/2020 11:26:38,901] query_controller.create_and_run_query()
+[20/Oct/2020 11:26:38,902] query_controller.create_query()
+[20/Oct/2020 11:26:38,907] ERROR: could not translating key collection 'collection', using it raw.
+[20/Oct/2020 11:26:38,907] ERROR: could not translating key page 'page', using it raw.
+[20/Oct/2020 11:26:38,908] construct_query: https://alta.astron.nl/altapi/dataproducts?collection=imaging_and_page=4_and_dataProductSubType__in=calibratedVisibility,continuumMF,continuumChunk,imageCube,beamCube,polarisationImage,polarisationCube,continuumCube_and_page_size=50
+[20/Oct/2020 11:26:38,909] query_controller.run_query()
+[20/Oct/2020 11:26:38,910] run-query: https://alta.astron.nl/altapi/dataproducts?collection=imaging&page=4&dataProductSubType__in=calibratedVisibility,continuumMF,continuumChunk,imageCube,beamCube,polarisationImage,polarisationCube,continuumCube&page_size=50
+[20/Oct/2020 11:54:14,149] query_controller.create_and_run_query()
+[20/Oct/2020 11:54:14,150] query_controller.create_query()
+[20/Oct/2020 11:54:14,156] ERROR: could not translating key collection 'collection', using it raw.
+[20/Oct/2020 11:54:14,156] ERROR: could not translating key page 'page', using it raw.
+[20/Oct/2020 11:54:14,156] construct_query: https://alta.astron.nl/altapi/dataproducts?collection=imaging_and_page=1_and_dataProductSubType__in=uncalibratedVisibility_and_page_size=50
+[20/Oct/2020 11:54:14,160] query_controller.run_query()
+[20/Oct/2020 11:54:14,161] run-query: https://alta.astron.nl/altapi/dataproducts?collection=imaging&page=1&dataProductSubType__in=uncalibratedVisibility&page_size=50
+[20/Oct/2020 11:54:17,773] query_controller.create_and_run_query()
+[20/Oct/2020 11:54:17,774] query_controller.create_query()
+[20/Oct/2020 11:54:17,780] ERROR: could not translating key collection 'collection', using it raw.
+[20/Oct/2020 11:54:17,780] ERROR: could not translating key page 'page', using it raw.
+[20/Oct/2020 11:54:17,781] construct_query: https://alta.astron.nl/altapi/dataproducts?collection=imaging_and_page=2_and_dataProductSubType__in=uncalibratedVisibility_and_page_size=50
+[20/Oct/2020 11:54:17,784] query_controller.run_query()
+[20/Oct/2020 11:54:17,784] run-query: https://alta.astron.nl/altapi/dataproducts?collection=imaging&page=2&dataProductSubType__in=uncalibratedVisibility&page_size=50
+[20/Oct/2020 11:54:21,102] query_controller.create_and_run_query()
+[20/Oct/2020 11:54:21,102] query_controller.create_query()
+[20/Oct/2020 11:54:21,106] ERROR: could not translating key collection 'collection', using it raw.
+[20/Oct/2020 11:54:21,107] ERROR: could not translating key page 'page', using it raw.
+[20/Oct/2020 11:54:21,107] construct_query: https://alta.astron.nl/altapi/dataproducts?collection=imaging_and_page=8_and_dataProductSubType__in=uncalibratedVisibility_and_page_size=50
+[20/Oct/2020 11:54:21,109] query_controller.run_query()
+[20/Oct/2020 11:54:21,110] run-query: https://alta.astron.nl/altapi/dataproducts?collection=imaging&page=8&dataProductSubType__in=uncalibratedVisibility&page_size=50