Incorporate new ufo-core functionality