Added function and language constructs etc.