Added more function annotations.