Implementing Requirement https://issuetracker02.eggits.net/browse/ODB-17