Finished work of supporting soomla-core