Adjusting to fit UnBiquitous/uos_core/refactoring_uos_initializer branch