Add more GIR annotations