Issue #186

Solves https://github.com/UPDDI/mps-database-server/issues/186 and cleans up interface.