Added more versions of hapi-structures