Finished work on integration with soomla-core