Adjusting implementation to match the core lib refactoring
Authored by: krinosx 2014-05-08
Parent: [r46]