Added Servatus lib ported from dev project