Added function, modules and scope sections