Fixed architecture issue.
//TODO .. methods issues have to be fixed.