Refactoring

Refectoring functionality from DP to Util.
Preparing Add-features.