Updated to match cppmicroservices DEV version 1