Update docblock and documentation