Update to hpp version 3