Moved code from core framework to distinct component