Updated function signatures.