diff --git a/Database.md b/Database.md
index af8f694..9f64850 100644
--- a/Database.md
+++ b/Database.md
@@ -54,44 +54,76 @@ Assignment table represents exercise assignment in a group. It holds keys of the
 
 ## Resource
 
+- _id_ --
+- _permissions_ --
+
 ## Role
 
+- _id_ --
+- _parentRole_ --
+- _childRoles_ --
+- _permissions_ --
+
 ## RuntimeEnvironment
 
+- _name_ --
+- _language_ --
+- _extensions_ --
+- _platform_ --
+- _description_ --
+
 ## Solution
 
+- _user_ --
+- _files_ --
+- _solutionRuntimeConfig_ --
+- _evaluated_ --
+
+
 ## SolutionEvaluation
 
+- _evaluatedAt_ --
+- _initFailed_ --
+- _score_ --
+- _points_ --
+- _bonusPoints_ --
+- _isValid_ --
+- _evaluationFailed_ --
+- _resultYml_ --
+- _testResults_ --
+
 ## SolutionFile
 
+- _solution_ --
+
 ## SolutionRuntimeConfig
 
-- _name_ --
-- _runtimeEnvironment_ --
-- _jobConfigFilePath_ --
-- _createdAt_ --
-- _solutionRuntimeConfig_ --
+- _name_ -- human readable identificator of runtime configuration
+- _runtimeEnvironment_ -- corresponding runtime environment
+- _jobConfigFilePath_ -- path to job configuration which is stored at api server
+- _createdAt_ -- datetime of entity creation
+- _createdFrom_ -- parent solution runtime configuration from which this one was created
 
 ## Submission
 
-- _submittedAt_ --
-- _note_ --
-- _resultsUrl_ --
-- _assignment_ --
-- _user_ --
-- _submittedBy_ --
-- _solution_ --
-- _asynchronous_ --
-- _evaluation_ --
+- _submittedAt_ -- datetime of submission creation
+- _note_ -- user can provide note to his/hers exercise solution
+- _resultsUrl_ -- URL pointed to fileserver from which results of submission can be internally downloaded
+- _assignment_ -- corresponding assignment to which submission belongs to
+- _user_ -- user to whom submission belongs to
+- _submittedBy_ -- user who submitted solution of exercise, can be supervisor for instance
+- _solution_ -- corresponding solution
+- _asynchronous_ -- exercise solution was submitted asynchronously, this happens when supervisor or superadmin submit solution for particular user
+- _evaluation_ -- evaluation of this submission
 
 ## SubmissionFailure
 
-- _type_ --
-- _description_ --
-- _submission_ --
-- _createdAt_ --
-- _resolvedAt_ --
-- _resolutionNote_ --
+- _type_ -- type of failure, can be for example _broker_reject_ or _evaluation_failure_
+- _description_ -- description of failure which was provided by backend
+- _submission_ -- associated submission which failed
+- _createdAt_ -- datetime of entity creation
+- _resolvedAt_ -- datetime when failure was resolved
+- _resolutionNote_ -- user can provide description when failure is resolved
 
 ## TestResult