Add some more function annotations